RDKB-63545 : Add PSM defaults for SKY-UK XER10 device#221
RDKB-63545 : Add PSM defaults for SKY-UK XER10 device#221aadhithan01 wants to merge 5 commits intodevelopfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This pull request adds PSM (Persistent Storage Manager) default configuration support for the SKY-UK partner on XER10 devices (model SCER11BEL). The changes enable PSM migration by allowing partner-specific JSON configuration values to be properly applied to PSM storage for this device model.
Changes:
- Added conditional logic in utopia_init.sh to call apply_system_defaults_psm for sky-uk partner on XER10 devices
- Implemented isXER10Device() helper function to detect SCER11BEL devices
- Added support for processing override-only parameters from partner JSON configuration
- Enhanced PSM parameter handling for XER10 devices in the partner defaults application logic
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| source/scripts/init/system/utopia_init.sh | Added conditional check to invoke apply_system_defaults_psm for sky-uk partner on XER10 (SCER11BEL) devices |
| source/scripts/init/src/apply_system_defaults_helper.c | Added isXER10Device() function, marked unused function with attribute, implemented override-only parameter processing in two functions, and added XER10-specific PSM logging |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Remove redundant XER10-specific logging that duplicates existing log output - Extract duplicated override processing logic into process_override_only_parameters helper function - Reduces code duplication and improves maintainability
This reverts commit 2ac1fb0.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Fixed memory leak where newParamObj was created but not added to JSON tree when psm_supported or syscfg_supported conditions failed. Now the object is always added to the tree unconditionally at line 2329, with only the database operations remaining conditional. This ensures proper memory cleanup when the root JSON is deleted.
| PARTNER_ID=`syscfg get PartnerID` | ||
| if [ "$PARTNER_ID" = "sky-uk" ] && [ "$MODEL_NUM" = "SCER11BEL" ]; then | ||
| echo_t "[utopia][init] Partner ID is sky-uk and device is XER10, applying partner defaults for psm" | ||
| apply_system_defaults_psm |
There was a problem hiding this comment.
Can you please confirm FR case will work on this scenario? Also do we need to handle this in different utility as apply_system_defaults can't handle this?
2 participants
Adding the PSM entries for the sky-uk partner ID, enabling the PSM migration, which will take the partner_json values to the PSM values
TEST STEPS : https://ccp.sys.comcast.net/browse/RDKB-63545
UT:
https://ccp.sys.comcast.net/browse/RDKB-63545?focusedId=24617629&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-24617629